From ad534c2bb7edebd6d076448d4a867f4d61f6228f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Aug 2004 04:30:26 +0000 Subject: [PATCH] Don't leak the file contents. Mon Aug 9 00:28:34 2004 Matthias Clasen * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the file contents. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkicontheme.c | 4 +++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 57a6bca961..07020d1aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 9 00:28:34 2004 Matthias Clasen + + * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the + file contents. + Mon Aug 9 00:13:03 2004 Matthias Clasen * gtk/gtkaboutdialog.c (icon_set_new_from_pixbufs): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 57a6bca961..07020d1aff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Aug 9 00:28:34 2004 Matthias Clasen + + * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the + file contents. + Mon Aug 9 00:13:03 2004 Matthias Clasen * gtk/gtkaboutdialog.c (icon_set_new_from_pixbufs): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 57a6bca961..07020d1aff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Aug 9 00:28:34 2004 Matthias Clasen + + * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the + file contents. + Mon Aug 9 00:13:03 2004 Matthias Clasen * gtk/gtkaboutdialog.c (icon_set_new_from_pixbufs): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 57a6bca961..07020d1aff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Aug 9 00:28:34 2004 Matthias Clasen + + * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the + file contents. + Mon Aug 9 00:13:03 2004 Matthias Clasen * gtk/gtkaboutdialog.c (icon_set_new_from_pixbufs): Don't diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 09110a7959..5c4603f209 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -2195,7 +2195,7 @@ load_svg_at_size (const gchar *filename, { GdkPixbuf *pixbuf = NULL; GdkPixbufLoader *loader = NULL; - gchar *contents; + gchar *contents = NULL; gsize length; if (!g_file_get_contents (filename, @@ -2219,6 +2219,8 @@ load_svg_at_size (const gchar *filename, bail: if (loader) g_object_unref (loader); + if (contents) + g_free (contents); return pixbuf; } -- 2.30.2